Fixed conflict while rebasing master.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 69ccde5bf97d021fa9046cb99f3c9de0588f2bda..09879cecad798978bd1fdc24fd5899ac20363356 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5250,11 +5250,6 @@ gtk_window_size_allocate (GtkWidget     *widget,
        }
       else
        {
-         if (priv->frame)
-           gdk_window_resize (priv->frame,
-                              allocation->width + priv->frame_left + priv->frame_right,
-                              allocation->height + priv->frame_top + priv->frame_bottom);
-         
          update_grip_visibility (window);
          set_grip_position (window);
        }
@@ -5273,12 +5268,6 @@ gtk_window_size_allocate (GtkWidget     *widget,
 
       gtk_widget_size_allocate (child, &child_allocation);
     }
-
-  if (gtk_widget_get_realized (widget))
-    {
-      update_grip_visibility (window);
-      set_grip_position (window);
-    }
 }
 
 static gint